Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.1 into master #253

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open

Merge 1.1 into master #253

wants to merge 75 commits into from

Conversation

headius
Copy link
Member

@headius headius commented Jun 4, 2024

This is an attempt to merge in all changes from 1.1-stable into master for the next 1.2.x release.

The 1.1-stable branch diverged almost ten years ago, and only had one merge back to master in early 2015. Since then most maintenance and bug-fixing has occurred on the branch. This PR attempts to bring in all the changes for 1.1 and resolve the diff between the two branches so we can move forward with 1.2 releases.

kares and others added 30 commits April 27, 2015 21:13
... (this is relevant since Bundler >= 1.10.1)
kares and others added 22 commits August 2, 2017 12:54
to decide if call has been handeled

If not, no OPTION calls will be passed down to the rack app due to the fact
that some implementations of DefaultServlet (i.e. Jetty) also sets 'Date'

Fixes jruby#205
since 4.0 Response#stream is added and body is wrapped in a buffer 
(which does more than body.each)

resolves jruby#210 (broken Rails streaming for Rails 4.x)
* Add Rack::Handler::Servlet::DefaultEnv#get_header

Fixes jruby#211

* Update Rack::Handler::Servlet::DefaultEnv

Add missing methods to handle ActionController::Base#reset_session
should be a compromise as users using an error app would have been
confused by the new ERROR message (wasn't there previously)
* '1.1-stable' of github.com:jruby/jruby-rack:
  [fix] Don't let getSession cause an infinite loop if it throws IllegalStateException (jruby#216)
@headius headius added this to the 1.2.1 milestone Jun 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants